merge emacs-23
authorKenichi Handa <handa@m17n.org>
Tue, 1 Feb 2011 04:31:02 +0000 (13:31 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 1 Feb 2011 04:31:02 +0000 (13:31 +0900)

Trivial merge